Added a view and a collection
Cleanup