Better restoration functionality