Fixed issue with blank dicts/lists in kwargs
Fixed issue with enabled
Moved convenience is configured wrapper