Updated JPA mappings to use Map<> rather than Set<> where possible