Hi Danlannz,
Thanks for your reply!
I did not know about shadow buckets, but in a quick googled I found it - One more time, Jens helping the people 
: Does Bucket shadowing is recommended way to sync data between server and mobile?
Within all alternatives, changing Ottoman code seems to be less traumatic in subsequent refactoring point of view.
Thanks guys!