Refactor Constructor handling and RequestArgs