More internal refactor