Add update/insert fallback, class groups