Add MetaData field to Heap and refactor Heap members