Added more to HMatrix