Improve sponsors code