Updated for new essence version