Updates for new Entropy