Restructuring for Future language support