Update to handle separation of EQ into EQ and CQ objects

Signed-off-by: Sean Hefty <sean.hefty@intel.com>