Added buffering to component adding / removal.