Add building uid
Fix classSpliter non-greedy