Additional refs
Change annotation format to something more sane so we can pick up positions