Yes, I agree.  I already thought of creating a specific ObjectPolicy interface with different implementations ('oldCore', 'updateOrCreate' and maybe later, the proposition of Sergiu).  But this imply much more work so I will probably not do this now but later.  Anyway, if somebody can advise me on a good way to do it, it'll probably motivate me to see clearer and to make it faster ;-)