Merge "Added data service manager"