Added more list functionality