Added: Support for custom container.