Replaced expiration with location