Updated templates.
New data model prototype: