Issue refs #1327: dto's refactoring
Issue refs #1327: update api-client