Adding multi-view support