Changed effects to use effect classes