Add support for Factory.create and Constructor.create