Moved constants into seperate class