Updated datasources to new 4.7.x syntax