FWIW, I like that you include water content, libraries like google's health connect seem to have completely separate data structures for nutrition and hydration.