Added keypairs management