ServiceInitializer refactored