Code changes to support alternate paths