Woppa - Changed diagnostics data to edtservices data
Changed functional data to edtdata