Adding the host process and fixing the references