moved keys definitions to main typedef header file