Should we just use `LAST_ACTIVE` instead of adding a similar key? ( I guess that was the intension of the ticket)