Added name attribute and updated factories