Refactor pass through.