Applying the changes introduced by hashtable factory