land l20nxml refactor