Refactored proto model to use message container and changed model headers to include their container header.