REFRACTOR AddHost AddMate