Add language selection, use new API.