Added advanced view functionality