With this change, we don't need `container` parameter anymore, right?