Updating Modular support for better protocol management