Add optimizations: