Better treatment of EStruct