Maybe it would be better not to break the first line of the dictionary, in order to have the same coding style throughout the project.
This applies to every occurrence. I like the idea of passing **kwargs to the factory, though :+1: