Replace container_location with a relationship definition and remove the dedicated type.