Update the code for docker to be not dependent