Switched to class constants