Revise data-structure for ring