Add preserveObjects option