Autoloading improved
Wiring separated