Added name property to Entry