Added callback option for extra_fields