Change return type of various methods from Collection to List