If these args are expected most of the times, we should make them explicit as method args instead of kwargs.

Also, good idea to do something like this instead of if statements:
http://stackoverflow.com/questions/5624912/kwargs-parsing-best-practice