Add Better Logging