Minor update on Data Manager

Remove table name, refine the data manager