Added 2 views hidden by default
Added views support