- Moved constants to BaseConstants