Lisa Edelstein is trading a House for a Castle.

The TV MVP is joining the ABC hit’s Season 6 cast for a multiple-episode arc, TVLine has learned exclusively.

RELATED | Castle Season 6 Preview: Nathan Fillion Weighs In on Rick’s ‘Adult Choice’ — and Answers a Burning Question

The actress will play Rachel McCord, a tough and highly-skilled Federal Investigator whose appearance plays a vital role in Beckett’s decisions about her future.

As you know, Season 5 ended with Beckett considering a move to Washington D.C. to work on a special task force in the U.S. Attorney General’s office — a decision presumably complicated by Rick proposing marriage in the very final scene.

RELATED | Fall TV Grid: What’s on When? And Versus What?

Edelstein’s post-House credits include stints on The Good Wife, Elementary, House of Lies and, most recently, Scandal.