Merged Dvora's language support