Fixing the stages to conform to new apis