@meleu I have a more generic plan for modules, but needs some more planning and work. Es-dev was a quick fix due to breakage, but I'd rather not do more.