Cleaned up session a bit.
Added property to mapping manager to make specifying mapping easier