Adding boundary work for code churn