More logger changes, optimized resource usage