Fix language support for mapper