Added locations and tags