adjust to container block refactoring