Refactor for more module ANN