Can we add name as an optional parameter for all the reference records and avoid having to always add the surrounding record to the inner reference?