Putting back some features in hoffman_core