code refactor - service support