Added support for expiring keys