Common Controller

Fix internal Controller routing