added missing proto wrappers and made case classes final