Added Event and validator classes