Input Refactor for Integration