Refactored stdout enabling
Refactoring
Added ODT support