Refactored output config objects