Adding database system, fix #5