Modified EAO Classes