Modified EventServer for buffering changes