Implemented functionality to support more than 16 vehicles