Added curl and kriswallsmith/buzz support