Updating feat_lang with the latest changes