Make EventQueue non generic