Changing the delegate to match client architecture