Updated to enable Docker