Changes to the view passing
Further changes on simple.data