Working on updated RoadRunner integration