Added crypto, only ecc missing