Added vendor resolver and almond