Added views stuff