Added ability to choose table names