Refactor: Move event adding, use property

Change-Id: Idaad4f0c4c89d806b79bb4d9513c92a8a99f4e73