Map functionality moved to separate service