Added more key enhancements