Using new protobuf files and removed the duplicated SystemType and using only the Protobuf generated one.