Merge "Adds usage stat columns to Entity"