Refactoring - fleets CRUD, maps methods