Improved executor api