Implemented extra_fields