Vehicle refactor 2014