Add stage support