Update func call
Update new func and use singleton
Add database.py