Updated for shared table improvements.