- adjust resolvers for Deadbolt
- change controllers classes to be objects