Better constants implementation
Better constants implementation