Major updates to support google fusion tables.