fixup! Add more key names