Fix: Fix TCL commands - they are now modular too!