Added processing of template properties into separate fields.