Feature/dynamicview