Added support for views
Added Locale