Refactor like container.