Changed datastructure to support the expire key