DDBNEXT-981: Refactoring Constants