Made effectors generic as well.