Updated dart client