Refactor unclaimed draft parameters