changes to support lang
More updates