got rid of supported_tables