Refactor to List<> interface instead of concrete classes