Refactor service activation to builder class