Added extra host and switch