Added proper hash tables.