Added name field handling