Revert "[BUGFIX] Replace the table definition manipulation by signals"