Service refactoring
Require 1.26.0