Adds enabled mapping option (default true)

Not sure if you want this one too...