adding type info for of_string and to_string for enums and pickle, unpickle to avoid compile error
fixed merge conflict