Added more mappable keys