Update to lang schema