Added update for map on options. Reduce the boiler plate, and start the dogfooding.