Add more expiration options