Added additional logging options