Updating to the new API, this may break on Travis until the tables are deleted