[UPDATE] move mapping to parent scope.