Prework for further language support