Removed hard coded table names.