Moved Instance generation from Extensions to InstanceFactory