Fix list handling to only use the API