Added mapping cases