Issue #4 : Improvement to table use