Updated for model object view base