Refactor of veh classes