Added tracking of locations