Moved constants to type file