Amended Vehicle class