Moved constants to another file