335 inject efq class

See #335.