CR fixes, saveOrCreate
CR fixes