Extract factory creation/use to new class
Use extension class for object creation