Update Tools.java for adv data support.