Moved keys to their own data type