Added LapCount entity to track lap-counts