Added name attribute to Location