Fix hard coded table_schema & 	Allow to not specify schema