Refactor to use new envy API (Squash after review)