Changes done as per the modified database desing [Finishes #58859320]