Added new constants classes
refactor
sad