Add support for composite / collection view

Add templates.
Few syntax fixes (trailing commas).