Add new templates

See #1