Now includes views initialisation