Update BasicView as well and made loading faster