Event framework added