Moved constants to reference classes