Continue updating functions to work with List