Improved performance (requires action provider version 1.61)