[Modified] Modified schema & database
Merge remote-tracking branch 'origin/master'