Updated HMatrix and HPlane