Improvements for factory with one more type to create.