Adding autoload support