Added autoload and target-dir