Added CF 8&9 Datasources