Add PagedResults and OptionsSelected classes