Expanded the View class