#519 module forward method refactor