Added more database utility