expanded for custom_field compatablities