Adding more I2P related stuff