Added support for id model and view references