Added stage mapping