Expiration support. Closes #3