Added hook for extra_fields