Updated logging stuffs in data API