Changed type identifiers from uint32 to enum types