updated annotations for new way of saving settings and custom fields