Increased logging functionality