Added support for View and Model