Additions/changes supporting entity output