Added mapping functionality @ edit user