Added **kwargs to all classes