Simplifying mapping some more.
Updating copyright.