add loading and remove for maps