Changed the units into public constants in the Controller class