Check out the R2-C2 (Droid Factory)! Disney's take on Ziro's droid has different glasses, a different drink spigot, and uses that build-a-droid mold.   Hasbro has one too as an Entertainment Earth Exclusive, and I'd say just get both - Ziro probably needs a lot of drinks.  Read on!