Added events + logging