Restructured key-value slot type; now keys and values are in different structures.