Added Expiry checking mechnisims