Refactoring fleets register