Improved logging - now writing class name to the log