Adding Validity Check & Content Name format