Updates to map. We can now have proxy targets routed properly.

Ref #51