Major changes for Heather lib