Refactored out vehicle specific interfaces