Added first name and last name separation