Add jdaddy, exchange & lion