Improve view performance