Update Controller system
Fix conflicts
Improve Controller creation