Made the stage element more modular.