Added more heap functionality