Update for new before_setp API