Added more keys to log data for