Added so names can containt digits