Refactor to new KMLBuilder