Added some structs for the eventbus