Proper serialization, add composites to report unit, add depluralize utility function