Updated Database tables

@rehab-arafa please review the updated columns :)