Refactored tool mode input/output options
More tool mode changes from DEV