fixup! fixup! Add EAV extraction format