Refactor
Replace protobuf