Add comments & string type