Improvements to completion table