Added more key types