Improved shape-stats support