Update of database implementation

#refs[7]