Improve optimization order