Added more fine grained logging options