fixed data references to be model references