Moved more constants to common