Refactoring to move static finals to factory class