Added Modular Systems integration