Added language selection and persistence.