ENH: Added data keys to the event descriptor