Add back validation and default number param