Added rewrap ANN component