Fixed support for related entity collections