Add missing createOrUpdate methods and UT