changes for removing hard coded table names done