Updated for latest docker version