Also adjust Table finders