Added number input support