Update proto and rest