Added name field back