Expiration constants added, _is_expired update, ...