Made changes to TagBuilder.java