Rework for better IDE