adding more instances of the decorator and kwargs.

The logic is that this might help with backwards compatability later.