Handle offset maps better.