Optimization and add new view.