Refactor lazy activation and type init
Refactor service creation