Added expiration check