Updated hashing factories to support new attribute types