Update modes and extend matching