Revert "Change of data structure for consistency"

This reverts commit 7346c700d2b265f381f87fd3d2deb3fb5a470443.