Adding support for schemas and multiple tables, Attempt to fix issue 178