changed Database API
Merge