Refactoring. Getters in factory with arguments? So ugly...