Improved controllers, by adding a guarded controller. This should make it a lot easier to have guards for various
controllers and prevent actors from handling things which may not be required.