Marvel’s Daredevil spin-off The Punisher has filled two key roles for its cast, EW has learned exclusively.

First, Ebon Moss-Bachrach (who played Marnie’s hapless love interest, the musician Desi, on HBO’s Girls) will star as Micro — a former NSA analyst “whose secrets may be of great value to Frank Castle (Jon Bernthal) and everyone around them.” In the comics, Micro (or Microchip) built weapons and tech for Castle, though in later issues evolved into a villain.

Also, Amber Rose Revah (Son of God) joins the cast as Dinah Madani, a “highly-trained sophisticated Homeland Security agent who is vexed by the Punisher.”

Frank Castle a.k.a. The Punisher was introduced in Daredevil season 2 earlier this year and became a breakout character. Netflix has since been ordered as a spin-off series with Steve Lightfoot (Hannibal) serving as showrunner and Jim Chory and Jeph Loeb (Daredevil, Jessica Jones, Luke Cage) as executive producers.