Added the name field functionality