Add Control-to-Control mappings

* also ensures consistency in mappings for the case where source and
  target models are the same