Added expiration support
Merge branch 'expiring'