[TASK] Add tablename + recordId