Moved constants into data section