Added name field and validation