added views, proxy models etc