Added persistence options