Added Accumulator, modified hierarchy