Preparing for ActionLogs support