Code review feedback (use ICollection instead of IList)