Add sorting and values()