Updated configuration
Refactored outputs