Moved more constants