Service responce refactor