Improved intent processing