Added 'ContainerHolder' class and refactored