Added infrastructure for filtering and sorting