Added Events support