Refactor API
Add defaultDatabase