Improved input support