Added mapping table