Updated completion rules