Constants moved to separate class