Added input support