updates for using custom_fields instead of dynamic_atrributes