Added vehicle data-object. Also some refactoring.