added support for default container