Improved direct handling