Add UnitController and modified RackController