Improved DatabaseAPI
Fixed DatabaseAPI improvement