Logging

Updated logging functionality