added selecting of tables to class