Moved constants to separate file