Refactoring - add helper function "getContainer()"