#403 Handle ElementCollection