refactoring constants
extracted constants, added more fields to the rest-client