Improve execute logic