add automatic mapping
Fix Bug with Table Name