Internal Changes for Invalidation