Update to new modular format