Better handling of tables/indexes with schemas