Added basic events add/update