Working the table_name and its resources from field type parameters.
Merge
Small Fixes