Added views functionality