Updated to use singular_table_name