Modified docker functions