Should we change the code structure in a way that it allows to add new language support easily and properly at runtime ?