Removed vehicle sub-type dependency