Prefix key name and Handle expiration. refactored