Added back in the roe struct features