Few changes to database modeL
Minor silly bug