multiple improvements and bug fixes for Data Service