More work on Sponsor blueprint