Done changes for Container.java