Extra performance improvements (for model update).