Model references fixed