Made custom fields configurable