refactoring for client requirements
changing gem namespace