Move to using CSRHub data