Fixed warnings
We now have a hashtable