Properly handle multiple view types

Also clarify javadoc