Fixing iterating over kwargs
Adding class