Add numeric mapping ranges

Fixes #872