Better support for > 8 row sample mappings