Make world change handling more efficient