Changed to Context mapper from attribute mapper