Add missing match cases