Moved the responsibility for recognizing requests out of services and into a dedicated mapping class.