Fixed DS to use abstract Heap