Added data model factory and workspace controller