Restructure Keys data type