[OES-299] extra fields :pig: