Renamed constant class
Refactored to use java 1.6