Moved constants to separate class