Including scaffold moves