Refactored Container into Registry