Move list methods to separate class