#683 Refactored data structure.