Refactored logging options