Added KML and UUID support