Keep input base types / interfaces separately from stages for readability. Cleaned up some unused interfaces in the process.
Achilleas Koutsou