Getting ready for lang support