Added hash tables and exported all