Approaching a working version based on add and update entity