Add further expiration options

Resolves #58