refactoring response tags for dataservice
refactoring data service response types due to client generation issues