Updated to include lower case table names