Performance improvement for DOM source