Added Markers and GPS management