Move constants to class constants