Reduce service provide complexity
Simplify ensure_container