Added more key support.