Moved constants to package object