Use a proper container API