Replaced old Data Structures with new one.