Instead of allowing for arbitrary keyword arguments which
makes the API hard to change in the future prefer to have
explicit arguments (and keyword arguments) instead of allowing
**kwargs to be passed.
Change-Id: I374db6b19ef76c2f9ee04771f5d928c79b7cf049