Fix autoload in combination with interfaces
Unified autoload (a bit)