Last pass on Dynamic Spec