Changing to add parcelable class for events