Updates for language design changes