Add full input support