Update to add vars for char set and collation