Added support for X-Fleet fields