Stop using primitive types in Controllers