add more method
Merge branch 'db'