Updated ListHandler