refactor baseline service