Added obstacles and lights to waypoints instance