Moving stuff for spec changes