Implement better approach than using factory for creating implementations

[mustafab0]

Factory probably not the best approach here

Originally posted by @spomichter in #1079 (comment)