Add hyper mapping (thanks steve losh)