Added AOE logics to ElemSham