Added collections and view model improvements