Redesign constants (not final one)