equipment policies update, equipment controller refactoring