Added Lang and updated classes