OrPlus class name fix
Agg & Then implements based on And & Or