LPS-49078 Use Set instead of a List