Add support for spun and optimizing