Update deprecated Set calls to use Hash