Added mapping ctor