Refined mappings, dumped a lot of useless ones.