Added @ElementCollection annotations for Sets