removed vip, added datastore api