Updated to new container API