Added GPSService
Refactored measurement model