Tweaks, and use annotations instead of map