Added support for multiple views