Fix Essentials integration once and for all