Updated for usage with new language services.