REFACTOR to make getClient method maintained in a separate class and also Constants