Added loop to add/remove maps