Update for new Effect API