lang handler and small structure modification