Fixed logging with new classes