New updates
Merged the code after DB change