Add support for cargo