Merge "Move constants to a separate class"