Added mapping code for conversions