Additions to genregmap (WIP)