Improved factories
Merge pull request #18 from kreta-io/feature/improved-factories

Improved factories