Using fire instead of until for created and updated events