Fixed methods in factory