Ajay | #3870 | Optimzied view usage