Spec and Config changes