Add database, there are bugs in query function in this version