Enumerate output module options according to API change.
Fix output module enumeration + code cleanup.
Use new input API.