Fix #21, switching to Table-per-Hierarchy approach