Adding support for invalidate