Added new logging for several classes