#19 Added hashtable