Get rid of Vehicle type, use AstTpEquipment instead and class to distinguish