Added list and view baseline functionality