Support for adding data to template, resolve #17