modify database model
Merge branch 'raysmond'