Added support for time limited keys