Added first/last names and validation