Add insert/update cb support