Added list criteria options for setup and retrieval