Major redesign of the way we initialize default services