Redo of initialization service to catch more use cases.