Improve binary and blob storage