Update to use TypeCode's