Added database and new API interfaces
post merge