Added more keys