Managing stage boundaries