Add some more optimization