Fixes for issue #7 Correct table names added