Bit more work towards embedded collections in objects