Yes - properties naming could be better, since hydration and extraction happens in order here...