Refactoring singleton container
Refactoring singleton container