Add missing _self
Remove private DB and rename public to "database"