Rewrote readers to use the more generic mapping system