Fix entry definition, add autoload definition