Add Heap support.