Modifications for logging