Remove needless lambda and add autoload cookie