Fixed issues with changing events to tuples