Added architecture for output modules