Added separate package to allow pulling in only delegate support