Adding support for language selection by the user