Changes as per database design

Changes as per database design