Added support for views