Add more key name comments