Refactoring register fleets
Refactoring register fleets