[IMP] improved two way and offline data support