Changing Hashtable to HashMap to improve performances