Make prepareForMove optional