Refactoring fleet data fields
Refactoring fleet data fields