Refactor FactoryPass