Added custom fields and templates