Made events Data Safe

solves #11