Some changes to Lang class