Added basic support for views