Simplified spark mapper more