Rework for deploy