Updated to Events v0.1.7