Improve peformance for adding hash to hashless output