Added rm-agent