Refactor sponsor