DDBNEXT-981: Refactoring Constants
DDBNEXT-981: Refactoring Constants