Adding constants

Refactoring and adding constants