Updated refactoring for migration to AbstractFactoryPattern implementation of lattice implementations.