Adding direct input support