Added heap classes