Improvements
Pandas/hfd-related changes