Update: Add type check for container.