Use Map.of() instead of Collections.emptyMap() in builders