ITTE-1036 Fixed Abstract Factory.