Updated build with task stage