Feature support

* adjust changes in views