Router added, BaseView added