Switch to using organization instead of publisher