Better view support, update views to works with it