Add language service and UI selector