Added support for ButtonClickRecords