Refactored protobuf messages.
Updated key mapping.