Better wrapping for /data