Optimize for remote storage