Add some optimization