Fix events - needs more work on mappings