Internal request refactor