Data structure reworked