Add support for persisting sort and other options