Improved share count support