Added additional views and updates