Added views and edited queies