Added expiration. Working on RDB dump ...