Added new Model and context. Hopefully this works in development Alfresco server.