Make even more keys mappable