modified dbhandler