Add missing code from update