Moved constants to ModelConstants