Better input support