Removed some unncessary lookups, since there are backrefs in the model