Added more fields for CMS custom form