Moved language selection to new feature structure