New protocol buffers schema and changes needed in java files