More support for factory to constructors