adapted Vehicle classes to the latest standard