Lang and A12n refactoring