Changes for local event model