Improve views integration